From dade40575b6b4a9ebe2b6aa30632213ac82e096b Mon Sep 17 00:00:00 2001 From: Kevin Cozens Date: Sat, 10 Feb 2007 04:16:17 +0000 Subject: [PATCH] Changed CVS reference to SVN. 2007-02-09 Kevin Cozens * autogen.sh: Changed CVS reference to SVN. * configure.ac: Set BABL_UNSTABLE to 1 for odd micro numbers when major and minor are both 0. * babl.pc.in * babl/Makefile.am * tests/Makefile.am: Use version number in library name. svn path=/trunk/; revision=214 --- ChangeLog | 11 +++++++++++ autogen.sh | 6 +++++- babl.pc.in | 2 +- babl/Makefile.am | 13 ++++++------- configure.ac | 35 ++++++++++++++++++++++++++++++++++- tests/Makefile.am | 3 ++- 6 files changed, 59 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 32604d0..9589f9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-02-09 Kevin Cozens + + * autogen.sh: Changed CVS reference to SVN. + + * configure.ac: Set BABL_UNSTABLE to 1 for odd micro numbers + when major and minor are both 0. + + * babl.pc.in + * babl/Makefile.am + * tests/Makefile.am: Use version number in library name. + 2007-02-09 Kevin Cozens * babl/Makefile.am diff --git a/autogen.sh b/autogen.sh index 0ce5cc9..fcb32da 100755 --- a/autogen.sh +++ b/autogen.sh @@ -72,7 +72,7 @@ check_version () echo echo "I am testing that you have the tools required to build the" -echo "$PROJECT from CVS. This test is not foolproof," +echo "$PROJECT project from SVN. This test is not foolproof" echo "so if anything goes wrong, see the file HACKING for more information..." echo @@ -215,6 +215,10 @@ $AUTOCONF || exit $? cd $ORIGDIR +echo +echo "Running ./configure..." +echo + $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" RC=$? if test $RC -ne 0; then diff --git a/babl.pc.in b/babl.pc.in index 5752e04..04b1fa4 100644 --- a/babl.pc.in +++ b/babl.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: babl Description: Dynamic, any to any, pixel format conversion library Version: @BABL_REAL_VERSION@ -Libs: -L${libdir} -lbabl @DL_LIB@ @MATH_LIB@ Cflags: -I${includedir}/@PACKAGE_NAME@-@BABL_API_VERSION@ +Libs: -L${libdir} -l@PACKAGE_NAME@-@BABL_API_VERSION@ @DL_LIB@ @MATH_LIB@ diff --git a/babl/Makefile.am b/babl/Makefile.am index d20caef..53de1d9 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -47,13 +47,12 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base AM_CPPFLAGS = -DPREFIX=\""$(prefix)"\" -lib_LTLIBRARIES= libbabl.la -libbabl_la_SOURCES= $(h_sources) $(c_sources) -libbabl_la_LIBADD=\ +lib_LTLIBRARIES= libbabl-@BABL_API_VERSION@.la +libbabl_@BABL_API_VERSION@_la_SOURCES= $(h_sources) $(c_sources) +libbabl_@BABL_API_VERSION@_la_LIBADD=\ base/libbase.la \ @LTLIBOBJS@ -libbabl_la_LDFLAGS= \ - -version-info $(BABL_LIBRARY_VERSION) \ - -release $(BABL_RELEASE) \ - ${no_undefined} +libbabl_@BABL_API_VERSION@_la_LDFLAGS= \ + ${no_undefined} \ + -version-info $(BABL_LIBRARY_VERSION) diff --git a/configure.ac b/configure.ac index 228fdea..6c5237f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,16 @@ +dnl Process this file with autoconf to produce a configure script. + AC_PREREQ(2.54) # Making releases on the stable branch: # BABL_MICRO_VERSION += 1; # BABL_INTERFACE_AGE += 1; +# BABL_BINARY_AGE += 1; +# if any functions have been added, +# set BABL_INTERFACE_AGE to 0. +# if backwards compatibility has been broken, +# set BABL_BINARY_AGE _and_ BABL_INTERFACE_AGE to 0. + m4_define([babl_major_version], 0) m4_define([babl_minor_version], 0) @@ -10,6 +18,8 @@ m4_define([babl_micro_version], 13) m4_define([babl_real_version], [babl_major_version.babl_minor_version.babl_micro_version]) m4_define([babl_version], [babl_real_version]) + +dnl Number of releases since we've added interfaces m4_define([babl_interface_age], [0]) m4_define([babl_binary_age], [m4_eval(100 * babl_minor_version + babl_micro_version)]) @@ -17,6 +27,13 @@ m4_define([babl_binary_age], # This is the X.Y used in -lbabl-X.Y m4_define([babl_api_version], [babl_major_version.babl_minor_version]) +m4_define([stability_version_number], + m4_if(m4_eval(babl_major_version || babl_minor_version), [0], + [babl_micro_version], [babl_minor_version])) +m4_define([babl_unstable], + m4_if(m4_eval(stability_version_number % 2), [1], [yes], [no])) +m4_define([babl_stable], + m4_if(m4_eval(stability_version_number % 2), [0], [yes], [no])) AC_INIT(babl, babl_major_version.babl_minor_version.babl_micro_version) AC_CONFIG_SRCDIR(babl/babl.h) @@ -41,6 +58,19 @@ AC_SUBST(BABL_API_VERSION) BABL_RELEASE=babl_api_version AC_SUBST(BABL_RELEASE) + +dnl The symbol BABL_UNSTABLE is defined above for substitution in +dnl Makefiles and conditionally defined here as a preprocessor symbol +dnl and automake conditional. +BABL_UNSTABLE=babl_unstable +if test "x$BABL_UNSTABLE" = "xyes"; then + AC_DEFINE(BABL_UNSTABLE, 1, + [Define to 1 if this is an unstable version of BABL]) +fi +AM_CONDITIONAL(BABL_UNSTABLE, test "x$GEGL_UNSTABLE" = "xyes") +AC_SUBST(BABL_UNSTABLE) + + # libtool versioning m4_define([lt_current], [m4_eval(100 * babl_minor_version + babl_micro_version - babl_interface_age)]) m4_define([lt_revision], [babl_interface_age]) @@ -53,8 +83,11 @@ AC_SUBST(BABL_CURRENT_MINUS_AGE) PACKAGE_NAME=babl AC_SUBST(PACKAGE_NAME) -AM_CONFIG_HEADER(config.h) + +dnl ========================================================================== + AM_INIT_AUTOMAKE(no-define) +AM_CONFIG_HEADER(config.h) AC_DISABLE_STATIC AC_PROG_CC diff --git a/tests/Makefile.am b/tests/Makefile.am index 946047b..e289b9d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -25,7 +25,8 @@ models_SOURCES = models.c AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl -LDADD = $(top_builddir)/babl/libbabl.la $(DL_LIB) $(MATH_LIB) +LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ + $(DL_LIB) $(MATH_LIB) noinst_PROGRAMS = \ introspect \ -- 2.30.2